Fixed ZEN-9835
Merge pull request #52 from ssamartyn/develop

Fixed ZEN-9835