Merge branch 'msi-dmi' into release