Merge from Qiuhua Master