Backport 11.1 bugfixes

[eivindjahren]

Backports some simple commits and the bugfix #9265

[codecov-commenter]

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 90.81%. Comparing base (5cb1b0e) to head (d3c10f6).
Report is 9 commits behind head on version-11.1.

Additional details and impacted files

@@               Coverage Diff                @@
##           version-11.1    #9266      +/-   ##
================================================
- Coverage         90.83%   90.81%   -0.03%     
================================================
  Files               352      352              
  Lines             21960    21961       +1     
================================================
- Hits              19948    19944       -4     
- Misses             2012     2017       +5     

Flag	Coverage Δ
cli-tests	39.20% <33.33%> (-0.02%)	⬇️
gui-tests	71.81% <33.33%> (-0.01%)	⬇️
performance-tests	49.37% <66.66%> (+0.02%)	⬆️
unit-tests	79.65% <100.00%> (-0.01%)	⬇️

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.