Merge branch 'msi-wmi' into release