Merge branch mguth-master-patch-27842 with refs/merge-requests/299/train into...

Merge branch mguth-master-patch-27842 with refs/merge-requests/299/train into refs/merge-requests/303/train
31 jobs for !303 with mguth-master-patch-27842 into master in 19 minutes and 26 seconds (queued for 28 seconds)
merge train