Merge branch svanstro/master-scaling-bugfix with refs/heads/master into...

Merge branch svanstro/master-scaling-bugfix with refs/heads/master into refs/merge-requests/223/train
22 jobs for !223 with svanstro/master-scaling-bugfix into master in 27 minutes and 29 seconds (queued for 6 seconds)
merge train