#4132 build changes