ee97bb17ba
Fix #30788 (cherry picked from commit 6ff2acc52c976e9d7bb6a5693f8a2365d12400f5)
Fix #30788 (cherry picked from commit 6ff2acc52c976e9d7bb6a5693f8a2365d12400f5)