Merge branch 'cherry-pick-d900b0ea' into 'branch_5.0'
Merge branch 'cherry-pick-94c9b333' into 'main'
Closes #552 (closed)
See merge request !720 (merged)
(cherry picked from commit d900b0ea)
6ebf44ca Merge branch 'cherry-pick-daf9a457' into 'main_moi'