Merge branch 'acpi-pad' into release