Merged the change of HouZhaoWei