DF-4466 fix after merge