commit from jifang 12.09