Merge release/2.6.0 in develop

[0xnm]

What does this PR do?

This PR does the merge of release/2.6.0 branch 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 #1862 (e5f90cc) into develop (b0b898c) will increase coverage by 0.12%.
The diff coverage is n/a.

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

Additional details and impacted files

@@             Coverage Diff             @@
##           develop    #1862      +/-   ##
===========================================
+ Coverage    83.51%   83.62%   +0.12%     
===========================================
  Files          470      470              
  Lines        16621    16628       +7     
  Branches      2499     2499              
===========================================
+ Hits         13880    13905      +25     
+ Misses        2056     2050       -6     
+ Partials       685      673      -12     

see 23 files with indirect coverage changes