Removed workaround for #774, fixed incorrect return of array
Added additional unit test for #774
Merge branch 'od/issue_774' into develop