Merge branch 'cherry-pick-359075b3' into 'main'

Merge branch 'issue_#305' into 'main'

See merge request !360 (merged)

(cherry picked from commit d3280950)

e6b88656 Merge branch 'issue_#305' into 'branch_4.2_moi'