Fix issue #1705170 (backport from trunk)
3 files changed