Fixed ZEN-15127 issue
Merge remote branch 'upstream/develop' into develop
Updated unit tests
Merge pull request #19 from ssOleg/develop

Fixed ZEN-15127 issue