Merge into main

[marac19901990]

Merge into main: #5516

[codecov]

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (a4d5b6d) 88.65% compared to head (6622bfd) 89.34%.
Report is 124 commits behind head on main.

Additional details and impacted files

@@             Coverage Diff              @@
##               main    #5656      +/-   ##
============================================
+ Coverage     88.65%   89.34%   +0.68%     
- Complexity     6347     6424      +77     
============================================
  Files           673      683      +10     
  Lines         20197    20405     +208     
============================================
+ Hits          17906    18231     +325     
+ Misses         2291     2174     -117     

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

[sebastianbergmann]

Thank you for your contribution. I appreciate the time you invested in preparing this pull request. If/when #5654 is merged into 9.6 then I will merge it to other branches such as 10.5 and main from there myself.