[DF-4725] Fix code after merge