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