Merge branch mguth-evaluation-fix with refs/heads/master into refs/merge-requests/525/train

49 jobs for !525 with mguth-evaluation-fix into master in 16 minutes and 40 seconds (queued for 2 seconds)
merge train