[DF-2992] Merge