(cherry picked from commit aca1971a12)
aca1971a12
Fixes #37109. (cherry picked from commit e817792c0a)
e817792c0a