Merge branch 'hotfix-5.0.0' into 'master'

Hotfix v5.0.0

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