Feature/task 1669