Merge changes from master

2 jobs for dev-add_compute
in 5 minutes and 4 seconds, using 0 compute credits, and was queued for 1 minute and 16 seconds