[DF-900] fix after merge