Fixed defect ZEN-13190
Merge remote branch 'upstream/develop' into develop
Merge pull request #223 from ssamartyn/develop

Fixed defect ZEN-13190
Merge pull request #222 from ssvsergeyev/develop

Fix for ZEN-13588
Fix for ZEN-13662