Fixed ZEN-8975
Merge remote-tracking branch 'upstream/develop' into develop
Merge fix
Retain the default behaviour before the zProps were changed
Merge pull request #18 from ssirushchyshyn/develop

Fix for ZEN-8975