Fixed ZEN-11384
Changes to code for defect ZEN-11384
Merge pull request #199 from ssamartyn/develop

Fixed ZEN-11384