Backport fix for issue #10684 from 3.x
3 files changed