ed0fc0ec46
Backport #31384 by wxiaoguang Fix #31374 Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
Backport #31384 by wxiaoguang Fix #31374 Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>