6e3dc97458
Fixes #10004 (cherry picked from commit 90d3dd22426bbf1b398026a28e4cb4d552e6f435)
Fixes #10004 (cherry picked from commit 90d3dd22426bbf1b398026a28e4cb4d552e6f435)