Fix for issue 7714 (backport from trunk)
2 files changed