Merge branch 'master' into enable_expert_plots

33 jobs for enable_expert_plots in 152 minutes and 38 seconds (queued for 5 seconds)