Merge branch 'acpi_enforce_resources' into release