merge attempt 20.3 -> 22.1

[DaanHoogland]

Description

This PR...

Types of changes

• Breaking change (fix or feature that would cause existing functionality to change)
• New feature (non-breaking change which adds functionality)
• Bug fix (non-breaking change which fixes an issue)
• Enhancement (improves an existing feature and functionality)
• Cleanup (Code refactoring and cleanup, that may add test cases)
• Build/CI
• Test (unit or integration test code)

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

• Major
• Minor

Bug Severity

• BLOCKER
• Critical
• Major
• Minor
• Trivial

Screenshots (if appropriate):

How Has This Been Tested?

How did you try to break this feature and the system with this change?

[DaanHoogland]

@abh1sar @Pearl1594 @winterhazel , I did a merge forward and after hours of fixing still have some unit test problems. In general I feel quite unsure if all your PRs came out of my tinkering ok. Can you have a look please?

[codecov]

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 3.70%. Comparing base (7324ef4) to head (bb09201).

❗ There is a different number of reports uploaded between BASE (7324ef4) and HEAD (bb09201). Click for more details.

HEAD has 1 upload less than BASE

Flag	BASE (7324ef4)	HEAD (bb09201)
unittests	1	0

Additional details and impacted files

@@              Coverage Diff              @@
##               4.22   #12644       +/-   ##
=============================================
- Coverage     17.62%    3.70%   -13.92%     
=============================================
  Files          5917      448     -5469     
  Lines        531255    38018   -493237     
  Branches      64951     7035    -57916     
=============================================
- Hits          93639     1409    -92230     
+ Misses       427077    36422   -390655     
+ Partials      10539      187    -10352     

Flag	Coverage Δ
uitests	3.70% <ø> (ø)
unittests	?

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.
• 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.