Merge GTC-3337 (part II) -> master

[gtempus]

Issue is explained in #707

Does this introduce a breaking change?

• Yes
• No

[codecov-commenter]

⚠️ Please install the to ensure uploads and comments are reliably processed by Codecov.

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 76.26%. Comparing base (fb3c1a4) to head (b0a1b82).
❗ Your organization needs to install the Codecov GitHub app to enable full functionality.

Additional details and impacted files

@@           Coverage Diff           @@
##           master     #708   +/-   ##
=======================================
  Coverage   76.26%   76.26%           
=======================================
  Files         143      143           
  Lines        6742     6742           
=======================================
  Hits         5142     5142           
  Misses       1600     1600           

Flag	Coverage Δ
unittests	76.26% <ø> (ø)

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.

🚀 New features to boost your workflow:

• ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.