Fix issue-1786
Merge remote-tracking branch 'dzikakis/issue-1786' into develop
Updated Version 3.0.12.016