Merge pull request #1361 from trhura/develop

Pull request for issue #856