Fixed ZEN-9169
Merge pull request #22 from ssirushchyshyn/develop

ZEN-9169