Merge pull request #192 from ssirushchyshyn/develop

ZEN-12401