Merge branch 'new-cluster'

4 jobs for master in 8 minutes and 19 seconds (queued for 3 seconds)