Fix for issue #9568.
2 files changed