[DF-1858] Intermediate changes.