3167128e30
Fixes #9520 (cherry picked from commit 8735f3566ff1b7945ba062d098302875fdf8eeab)
Fixes #9520 (cherry picked from commit 8735f3566ff1b7945ba062d098302875fdf8eeab)