Merge branch mguth-master-patch-12342 with refs/heads/master into refs/merge-requests/244/train

25 jobs for !244 with mguth-master-patch-12342 into master in 9 minutes and 34 seconds (queued for 5 seconds)
merge train