Merge branches 'release', 'acpi_disabled' and 'bugzilla-10958' into release