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

Fixed defect ZEN-13368