Merge branch 'feature/KAA-247' into feature/KAA-278
Kaa-278: implementation and tests