Fix for issue #7072
3 files changed