KAA-277: refactoring