added unit test for #498
Merge branch 'od/issue_498' into develop