Backport r59480.
Fix issue #1313119.
2 files changed