Merge branch svanstro/update-scaling-and-writing with refs/heads/master into...

Merge branch svanstro/update-scaling-and-writing with refs/heads/master into refs/merge-requests/527/train
49 jobs for !527 with svanstro/update-scaling-and-writing into master in 13 minutes and 30 seconds (queued for 3 seconds)
merge train