Merge release/2.4.0 into develop branch

[0xnm]

What does this PR do?

This PR does the merge release/2.4.0 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

Merging #1784 (dc983b9) into develop (e6f82e9) will increase coverage by 0.16%.
The diff coverage is n/a.

❗ Current head dc983b9 differs from pull request most recent head f1693ec. Consider uploading reports for the commit f1693ec to get more accurate results

Additional details and impacted files

@@             Coverage Diff             @@
##           develop    #1784      +/-   ##
===========================================
+ Coverage    83.47%   83.63%   +0.16%     
===========================================
  Files          466      465       -1     
  Lines        16364    16336      -28     
  Branches      2452     2454       +2     
===========================================
+ Hits         13659    13661       +2     
+ Misses        2039     2021      -18     
+ Partials       666      654      -12     

see 23 files with indirect coverage changes