Merge changes from master

4 jobs for dev-add_compute
in 3 minutes and 17 seconds, using 0 compute credits, and was queued for 1 second
latest