Merge branch 'acpi_pad' into release