Merge branch mguth-fix-unittests with refs/heads/master into refs/merge-requests/485/train

45 jobs for !485 with mguth-fix-unittests into master in 17 minutes and 40 seconds (queued for 3 seconds)
merge train