Fixed defect ZEN-7882
Merge remote branch 'upstream/develop' into develop
Merge pull request #11 from ssamartyn/develop

Fixed defect ZEN-7882