Merge release/2.10.0 branch into develop branch

[0xnm]

What does this PR do?

This PR merges release/2.10.0 branch into develop branch with all the conflicts resolved.

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 83.22%. Comparing base (b844675) to head (8bd3a87).

Additional details and impacted files

@@             Coverage Diff             @@
##           develop    #2054      +/-   ##
===========================================
+ Coverage    83.17%   83.22%   +0.05%     
===========================================
  Files          494      494              
  Lines        17739    17737       -2     
  Branches      2685     2684       -1     
===========================================
+ Hits         14753    14760       +7     
+ Misses        2251     2239      -12     
- Partials       735      738       +3     

see 35 files with indirect coverage changes