Merge "Improved nothing-to-do-build"