[DF-3293] Final changes.