Reverted pull #698, because contained 7d60edcb1af4 is the cause for #731
Merge branch 'od/issue_731' into develop