Merge branch mguth-pt-plotting with refs/heads/master into refs/merge-requests/434/train

42 jobs for !434 with mguth-pt-plotting into master in 13 minutes and 55 seconds (queued for 3 seconds)
merge train