Merge pull request #61 from ssirushchyshyn/develop

ZEN-10167 and ZEN-10168
Added category for zProperties (ZEN-10195)