Merge branches 'sh/core' and 'sh/kexec' into sh-latest