Merge and dpx fix