Merge branch 'develop-PATC2022' into 'master'

Develop patc2022

See merge request !196
1 job for master
in 2 minutes and 26 seconds, using 0 compute credits, and was queued for 3 seconds