Merge pull request !1860 from 王强/master

Merge pull request !1866 from liudingyan/master

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

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

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

Signed-off-by: zhupuxu <zhupuxu@huawei.com>

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

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

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

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

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

From: @chen-hua-baker
Reviewed-by: @wqtshg,@ji_chen
Signed-off-by: @ji_chen

From: @ldy2021_01
Reviewed-by: @ji_chen
Signed-off-by:

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

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

From: @wangzhengjun3
Reviewed-by: @wqtshg,@wangxiaotian22
Signed-off-by: @wqtshg

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

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

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

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