4baa396aa6
Fixes #9431 (cherry picked from commit 14c465d36f8265cb545405de867c4581468ecdc8)
Fixes #9431 (cherry picked from commit 14c465d36f8265cb545405de867c4581468ecdc8)