[DF-3919] Fix after merge