Restore latest dev

[YunchuWang]

Description

Fixes #

---

PR information

• The title of the PR is clear and informative.
• There are a small number of commits, each of which has an informative message. This means that previously merged commits do not appear in the history of the PR. For information on cleaning up the commits in your pull request, see this page.
• If applicable, the PR references the bug/issue that it fixes in the description.
• New Unit tests were added for the changes made and CI is passing.

Quality of Code and Contribution Guidelines

• I have read the contribution guidelines.

[codecov]

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 85.10%. Comparing base (b7fbdca) to head (a665b9d).

Additional details and impacted files

@@            Coverage Diff             @@
##              dev    #1445      +/-   ##
==========================================
- Coverage   85.30%   85.10%   -0.21%     
==========================================
  Files          35       35              
  Lines        1974     1974              
  Branches      374      374              
==========================================
- Hits         1684     1680       -4     
- Misses        215      218       +3     
- Partials       75       76       +1     

Flag	Coverage Δ
unittests	85.05% <100.00%> (-0.21%)	⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.