e1fc81cc66
Fixes #9669 (cherry picked from commit 16cbcecd99c24f87b087dc7d02b8ccc93f1f1251)
Fixes #9669 (cherry picked from commit 16cbcecd99c24f87b087dc7d02b8ccc93f1f1251)