[DF-2395] Final changes.