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

Develop v5.1.1

See merge request !195
1 job for v5.1.1
in 0 seconds, using 0 compute credits, and was queued for 0 seconds