Merge branch 'minor-fixes' into 'master'

minor fixes

See merge request !870
12 jobs for master
in 27 minutes and 32 seconds and was queued for 1 second
Scheduled