Merge branches 'release' and 'dsdt-override' into release