1.2.0 build merge fixes