[DF-1858] Final changes for task #2.