Merge branch mguth-variable-test with refs/heads/master into refs/merge-requests/309/train

32 jobs for !309 with mguth-variable-test into master in 10 minutes and 25 seconds (queued for 12 seconds)
merge train