Feature/kaa 173

Reviewers - Andrey Shvayka and Yaroslav Zeygerman.