Merged the changes of lixiaohua