Feature/task 2887