[DF-5048] fix after merge