Merge pull request #4454 from poranje/fs#785