
Backport #25818 by @wxiaoguang Fix #25817  Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
Backport #25818 by @wxiaoguang Fix #25817  Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>