Merge pull request #36 from ssirushchyshyn/develop

ZEN-15670