2.9.2 -> 2.10 build changes