Merge branch mguth-non-transparent with refs/heads/master into refs/merge-requests/590/train

52 jobs for !590 with mguth-non-transparent into master in 20 minutes and 46 seconds (queued for 4 seconds)
merge train