a18ce256eb
Fixes #8861 (cherry picked from commit 60456fe0e95966134c47f0f8401eef001690f8e0)
Fixes #8861 (cherry picked from commit 60456fe0e95966134c47f0f8401eef001690f8e0)