Sync master branch to 2.2.

[terabytesoftw]

Q	A
Is bugfix?	✔️
New feature?	❌
Breaks BC?	❌

[codecov]

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 65.60%. Comparing base (87cca05) to head (05fd4ab).
Report is 1 commits behind head on 2.2.

Additional details and impacted files

@@            Coverage Diff            @@
##                2.2   #20365   +/-   ##
=========================================
  Coverage     65.60%   65.60%           
  Complexity    11282    11282           
=========================================
  Files           426      426           
  Lines         36818    36818           
=========================================
  Hits          24154    24154           
  Misses        12664    12664           

☔ 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.