Merge UAT 0.4.0.pre to master branch