Backport #10526

[peterallenwebb]

Resolves #10434

Backports #10526

Checklist

• I have read the contributing guide and understand what's expected of me.
• I have run this code in development, and it appears to resolve the stated issue.
• This PR includes tests, or tests are not required or relevant for this PR.
• This PR has no interface changes (e.g., macros, CLI, logs, JSON artifacts, config files, adapter interface, etc.) or this PR has already received feedback and approval from Product or DX.
• This PR includes type annotations for new and modified functions.

[codecov]

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 88.32%. Comparing base (8ee5788) to head (49b80aa).
Report is 1 commits behind head on 1.8.latest.

Additional details and impacted files

@@              Coverage Diff               @@
##           1.8.latest   #10567      +/-   ##
==============================================
- Coverage       88.32%   88.32%   -0.01%     
==============================================
  Files             181      181              
  Lines           22779    22793      +14     
==============================================
+ Hits            20119    20131      +12     
- Misses           2660     2662       +2     

Flag	Coverage Δ
integration	85.57% <100.00%> (-0.01%)	⬇️
unit	62.83% <100.00%> (+0.02%)	⬆️

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.