Merge UAT 1.12.0.pre to master