Resolved merge conflicts with master

4 jobs for dev-plot_extreme_probs
in 16 minutes and 44 seconds, using 0 compute credits, and was queued for 3 minutes and 24 seconds