Commit from xueliang