Merge pull request #51 from ssamartyn/develop

Fixed ZEN-9780
Fixed ZEN-9835