Merge branch 'staging' into minor_fix_local_scripts

23 jobs for !62 with minor_fix_local_scripts
in 6 minutes and 11 seconds, using 0 compute credits, and was queued for 1 second
merge request