5e81ae1798
Fix #30683 (cherry picked from commit fd63b96f6a4c5b3ea9e53d37af85e0d2d09715b9)
Fix #30683 (cherry picked from commit fd63b96f6a4c5b3ea9e53d37af85e0d2d09715b9)