ac6d38e4b7
Backport #35708 by wxiaoguang Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
Backport #35708 by wxiaoguang Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>