commit from zhangyx.