[DF-2776] fix after merge