Merge pull request #897 from IT-Can/develop-fixes-896

Fixes for issue #896