Merge from uat 1.8.2.pre