Add mdpi back and make it the preferred config
Merge branch 'cm-10.1' into cm-10.1-dev