Merge branch 'patch-misc' into 'develop'

Patch misc

Closes #4431

See merge request !1252
1 job for develop in 24 seconds (queued for 4 seconds)