Merge changes from master, update to new structure

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