[DF-1858] - items 5 and 6 were fixed.
[DF-1858] - more changes (item 1 and item 7 were implemented).