Merge branch mguth-todos with refs/heads/master into refs/merge-requests/450/train

45 jobs for !450 with mguth-todos into master in 15 minutes and 36 seconds (queued for 17 seconds)
merge train