Merge branch mguth-master-patch-20961 with refs/heads/master into refs/merge-requests/477/train

45 jobs for !477 with mguth-master-patch-20961 into master in 15 minutes and 46 seconds (queued for 3 seconds)
merge train