f43b60700e
Fixes #8805 (cherry picked from commit bbf58178052ee609cd1538b93cbf09c7a8dae8e8)
Fixes #8805 (cherry picked from commit bbf58178052ee609cd1538b93cbf09c7a8dae8e8)