Merged in newer MDP from CAF (jb_mr1_chocolate)