Added unit test for #804
Merge branch 'od/issue_804' into develop