[DF-1214] fixed all issues described in comments of task.