Merge branch mguth-slim-image with refs/heads/master into refs/merge-requests/482/train

45 jobs for !482 with mguth-slim-image into master in 26 minutes and 59 seconds (queued for 3 seconds)
merge train