dingshuai commit in his local dev branch