Test infrastructure and build overhaul, round 938.