Fixed defect ZEN-12930
Merge remote branch 'upstream/develop' into develop
small fix for ZEN-12930
Merge pull request #217 from ssamartyn/develop

Fixed defect ZEN-12930