59713541b6
Backport #26086 by @CaiCandong close #26079 Co-authored-by: caicandong <50507092+CaiCandong@users.noreply.github.com>