OCT-6 and fixes #864
Fixes #897
Merge pull request #942 from Gravecorp/test

OCT-6 and fixes #864