145adfaaa1
Fixes #8885 (cherry picked from commit 34bb90f3c2d0cb3e8d3bb9564a702068dcb10b7e)
Fixes #8885 (cherry picked from commit 34bb90f3c2d0cb3e8d3bb9564a702068dcb10b7e)