[DF-2395] Intermediate changes.