1ff6b7783c
Backport #27434 by @CaiCandong Fix #27432 Regression of #27265 Co-authored-by: CaiCandong <50507092+CaiCandong@users.noreply.github.com>