Merge from uat 0.4.2.rc1