test by zhujianxin
Accept changes from zhujianxin.