Merge branch 'wmi-fix' into release-2.6.27