Close #29484  (cherry picked from commit 90435847792d26ac3f23f1a8479706afadec6b15)
b27e6e16