Merge branch mguth-small-fixes with refs/heads/master into refs/merge-requests/453/train

45 jobs for !453 with mguth-small-fixes into master in 23 minutes and 34 seconds (queued for 17 seconds)
merge train