#4133 associated build changes