Feature/task 2345