Fixed ZEN-11585
Fixed merge conflict
Merge pull request #38 from ssamartyn/develop

Fixed ZEN-11585