Merge bugfixes from master and resolve conflicts

2 jobs for dev-multimodel2
in 10 minutes and 44 seconds, using 0 compute credits, and was queued for 2 seconds