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