Feature/kaa 229

@tlemkin @dyosick @yzeygerman please review