Backport of fix for issue 1695.
2 files changed