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

From: @jojobugfree
Reviewed-by: @kisnwang,@zhoufeng54,@chujinjin
Signed-off-by: @chujinjin

From: @lijiaqi0612
Reviewed-by: @youui,@liangchenghui
Signed-off-by: @liangchenghui

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

From: @yao_yf
Reviewed-by: @stsuteng,@kisnwang
Signed-off-by: @stsuteng

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

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

Merge pull request !7339 from qujianwei/master

Merge pull request !7144 from chenzhongming/zomi_master