Merge release/2.21.0 into develop

[ambushwork]

What does this PR do?

A brief description of the change being made with this pull request.

Motivation

What inspired you to submit this pull request?

Additional Notes

Anything else we should know when reviewing?

Review checklist (to be filled by reviewers)

• Feature or bugfix MUST have appropriate tests (unit, integration, e2e)
• Make sure you discussed the feature or bugfix with the maintaining team in an Issue
• Make sure each commit and the PR mention the Issue number (cf the CONTRIBUTING doc)

[codecov-commenter]

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 70.09%. Comparing base (cedf2bd) to head (753da6a).

Additional details and impacted files

@@             Coverage Diff             @@
##           develop    #2632      +/-   ##
===========================================
+ Coverage    70.07%   70.09%   +0.02%     
===========================================
  Files          820      820              
  Lines        30568    30568              
  Branches      5132     5132              
===========================================
+ Hits         21418    21425       +7     
+ Misses        7725     7720       -5     
+ Partials      1425     1423       -2     

see 23 files with indirect coverage changes

🚀 New features to boost your workflow:

• ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.