[DF-2762] Intermediate changes.