merged master fixed conflicts

3 jobs for dev_cross
in 1 minute and 46 seconds, using 0 compute credits, and was queued for 3 seconds