Merge branch feature/jim.king/perf_tweaks with refs/heads/master into refs/merge-requests/535/train

3 jobs for !535 with feature/jim.king/perf_tweaks into master in 24 minutes and 24 seconds (queued for 3 seconds)
merge train