Backport #28433 by wxiaoguang Fix #28226 Co-authored-by: wxiaoguang <wxiaoguang@gmail.com> (cherry picked from commit 5e2bae7716)
5e2bae7716