Merge uat 1 0 3 pre to master

Travis build has passed.