dd60d31b5f
Fixes #9743 (cherry picked from commit 46e3b9e40d43b12241ad0cd0ec8fef51cf93d350)
Fixes #9743 (cherry picked from commit 46e3b9e40d43b12241ad0cd0ec8fef51cf93d350)