Merge branch mguth-master-patch-99858 with refs/heads/master into refs/merge-requests/468/train

45 jobs for !468 with mguth-master-patch-99858 into master in 24 minutes and 52 seconds (queued for 1 minute and 15 seconds)
merge train