Merge changes from master and resolve conflicts

2 jobs for dev-split_with_logs
in 37 seconds, using 0 compute credits, and was queued for 2 seconds