Merge release/2.5.0 branch into develop branch

[0xnm]

What does this PR do?

This PR does the merge of release/2.5.0 into develop branch with 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 #1825 (f625f66) into develop (7d96d64) will decrease coverage by 0.05%.
The diff coverage is n/a.

Additional details and impacted files

@@             Coverage Diff             @@
##           develop    #1825      +/-   ##
===========================================
- Coverage    83.57%   83.52%   -0.05%     
===========================================
  Files          467      467              
  Lines        16462    16470       +8     
  Branches      2480     2482       +2     
===========================================
- Hits         13757    13756       -1     
- Misses        2033     2034       +1     
- Partials       672      680       +8     

see 24 files with indirect coverage changes