Merge branch 'acer-wmi' into test