Feature/task 2220