Merge branch modify_plotting_API with refs/heads/master into refs/merge-requests/518/train

50 jobs for !518 with modify_plotting_API into master in 16 minutes and 2 seconds (queued for 2 seconds)
merge train