Merge from uat 3.0.1.rc1