[DF-185] Fixed merge issues