Merge branch 'x86/alternatives' into x86/core