Sync final build changes

This is applied to `master` to match the change to `source`.