Backport second fix for issue #11149.
2 files changed