Backport test-build from the master branch.