[DF-4152] Intermediate commit