merge UAT 0.8.0.pre to master