927f6105bf
Fixes #10070 (cherry picked from commit 9ecec5d468629f647f7c6370c78983d5bcf5b670)
Fixes #10070 (cherry picked from commit 9ecec5d468629f647f7c6370c78983d5bcf5b670)