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

Misc hot fixes

See merge request !596
8 jobs for v1.0.4_hotfix in 19 seconds (queued for 35 seconds)