Merge branch 'develop-v5.0.0_fix' into 'master'

Develop v5.0.0 fix

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