Merge branch 'acpi_enable' into release