[DF-1858] - items 1 and 7 were fixed.