Merge pull request #20 from ssOleg/develop

Fixed ZEN-14084 issue
Updated documentation for ZEN-14866 issue