Merge from uat 0.3.1.pre