Feature/task 1678