Intermediate unified build changes.