[DF-1858] - items 5 and 6 were fixed.