fa11413e90
Fixes #10252 (cherry picked from commit 80d6d412f379ef9796b7274c13c1c03883c800d3)
Fixes #10252 (cherry picked from commit 80d6d412f379ef9796b7274c13c1c03883c800d3)