Merge new changes from master

2 jobs for dev-new_s2dv_cube
in 5 minutes and 19 seconds, using 0 compute credits, and was queued for 1 second