Fixed ZEN-10586
Merge remote branch 'upstream/develop' into develop
Fixed ZEN-11894
Merge pull request #194 from ssamartyn/develop

Fixed ZEN-10586