BAZYNGO-736 fix
Merge branch 'feature/K4-K5' into feature/Merge-K4-K5