commit from chenlei