1b788946a7
Backport #34643 by wxiaoguang Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
Backport #34643 by wxiaoguang Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>