config and merge master

4 jobs for dev_cross
in 8 minutes and 52 seconds, using 0 compute credits, and was queued for 1 second