07c781473f
Fixes #8838 (cherry picked from commit a0f10f868e2ff8d46c3aea6b47d5151c6b705d8a)
Fixes #8838 (cherry picked from commit a0f10f868e2ff8d46c3aea6b47d5151c6b705d8a)