DF-5220 fix merge on max os x