[DF-1858] Intermediate fix.