Merge branch 'pnpacpi' into release