commit from zouteng@github