Backporing the fix from Issue #12692
3 files changed