Merge changes from master

1 job for develop-doc_new_s2dv_cube
in 36 seconds, using 0 compute credits, and was queued for 1 second