Merge branch 'v1.0.5-misc-fixes' into 'v1.0.5'

Misc hot fixes

See merge request !596
14 jobs for v1.0.5 in 33 minutes and 39 seconds (queued for 3 seconds)