Merge branch mguth-small-cleanup with refs/heads/master into refs/merge-requests/337/train

34 jobs for !337 with mguth-small-cleanup into master in 21 minutes and 14 seconds (queued for 2 seconds)
merge train