Fix #28052 Backport #28068 Before:   After:   Co-authored-by: yp05327 <576951401@qq.com> (cherry picked from commit 5043ad54c7a0d1dc6bf5f1caf21b4646ec9344d3)
5f299983
f0e12afd
47cccb7b
77825c0c