forth commit by wangxinlu