f93cf29df4
Fixes #8906 (cherry picked from commit 91004ad514d25be610a1f8cd1390b74faf46830b)
Fixes #8906 (cherry picked from commit 91004ad514d25be610a1f8cd1390b74faf46830b)