merging changes

3 jobs for dev_cross
in 5 minutes and 30 seconds, using 0 compute credits, and was queued for 3 seconds