commit by shenqiang
add yangbing
resolve conflit with yangbing
resolve conflit with yangbing
eidt 2