Merge pull request #15420 from swgillespie/test-build-perf