Merge branch 'develop-v5.0.1' into 'master'

Develop v5.0.1

See merge request !171
1 job for master
in 36 seconds, using 0 compute credits, and was queued for 3 seconds