DF-4010 fixes after merge