Merge branch mguth-unit-tests-fix with refs/heads/master into refs/merge-requests/314/train

27 jobs for !314 with mguth-unit-tests-fix into master in 12 minutes and 23 seconds (queued for 4 seconds)
merge train