Merge branch 'hp-wmi' into release