Fixes #8876 (cherry picked from commit f7f2072621bbcaf4ddbe07f746a5cf78490c95c9) (cherry picked from commit 9baa52db00f50620f0c5450c6aa32b0679747fab)
Fixes #8876 (cherry picked from commit f7f2072621bbcaf4ddbe07f746a5cf78490c95c9) (cherry picked from commit 9baa52db00f50620f0c5450c6aa32b0679747fab)