Fixes for ZEN-10939
Merge remote branch 'vova/develop' into develop