[DF-4070] Fixed merge issues