KEY-123: added ce4848ae42e94fc610dd2d406215f373
Merge branch 'to-be-merged' into test-branch-squash-take-2

ZI-3 ZI-4