Merge latest kexec changes