cherry-pick from #4394

[guoshengCS]

cherry-pick from #4394

[CLAassistant]

Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
2 out of 12 committers have signed the CLA.

:white_check_mark: jerrywgz
:white_check_mark: LielinJiang
:x: heavengate
:x: frankwhzhang
:x: parap1uie-s
:x: xyzhou-puck
:x: FrostML
:x: xjqbest
:x: shippingwang
:x: LDOUBLEV
:x: guoshengCS
:x: cjt222
_{You have signed the CLA already but the status is still pending? Let us recheck it.}