Merge release 1.11.0 branch into develop branch

[0xnm]

What does this PR do?

This PR does the merge of release/1.11.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 #192 (541d6a8) into develop (12b9386) will decrease coverage by 0.17%. The diff coverage is n/a.

@@              Coverage Diff              @@
##             develop     #192      +/-   ##
=============================================
- Coverage      86.87%   86.70%   -0.17%     
+ Complexity       178      177       -1     
=============================================
  Files             21       21              
  Lines            579      579              
  Branches          76       76              
=============================================
- Hits             503      502       -1     
  Misses            49       49              
- Partials          27       28       +1     

see 1 file with indirect coverage changes