Merge 'x86/seves' into x86/core