Merge branch mguth-ploting with refs/heads/master into refs/merge-requests/427/train

45 jobs for !427 with mguth-ploting into master in 21 minutes and 12 seconds (queued for 5 seconds)
merge train