Add useful comment from Jira.
Merge pull request #883 from benkonrath/bug-fixes

Add useful comment from Jira.