Merge from mdp