Merge pull request #21 from ssOleg/develop

Fixed ZEN-14062 issue
Merge pull request #22 from ssOleg/develop

Updated tests