Merge pull request !925 from weiyang/rename

From: @zhangxiaokun9
Reviewed-by: @ji_chen,@wqtshg
Signed-off-by: @ji_chen

Merge pull request !924 from weiyang/revert-merge-921-development

Merge pull request !921 from weiyang/rename

From: @zhangxiaokun9
Reviewed-by: @xchu42,@wangxiaotian22
Signed-off-by: @ji_chen

From: @hugo1
Reviewed-by: @xchu42,@wqtshg
Signed-off-by: @ji_chen

From: @zhangxiaokun9
Reviewed-by: 
Signed-off-by:

From: @wangwenhua1
Reviewed-by: @xchu42,@ji_chen
Signed-off-by: @ji_chen

From: @zhou_chao1993
Reviewed-by: @xchu42,@youui,@liujunzhu
Signed-off-by:

From: @nicholas_yhr
Reviewed-by: @wqtshg,@liujunzhu
Signed-off-by: @liujunzhu

From: @tangqunzhang
Reviewed-by: @wqtshg,@xchu42,@ji_chen
Signed-off-by: @ji_chen

From: @xchu42
Reviewed-by: @ji_chen,@wqtshg
Signed-off-by: @ji_chen

From: @taoxudonghaha
Reviewed-by: @ji_chen,@xchu42
Signed-off-by: @ji_chen

From: @ji_chen
Reviewed-by: @wangxiaotian22,@sheng-nan
Signed-off-by:

From: @taoxiangdong
Reviewed-by: 
Signed-off-by:

From: @zhangxiaokun9
Reviewed-by: @xchu42,@wqtshg
Signed-off-by: @wqtshg

From: @wan_xuelei
Reviewed-by: @xchu42,@wqtshg
Signed-off-by: @wqtshg

From: @zhangxiaokun9
Reviewed-by: @wangxiaotian22,@xchu42
Signed-off-by: @ji_chen

From: @wqtshg
Reviewed-by: @xchu42,@ji_chen
Signed-off-by: @ji_chen

From: @wan_xuelei
Reviewed-by: @xchu42,@wqtshg
Signed-off-by: @wqtshg