[DF-185] More fixes after merge