[DF-4841] Intermediate commit