Merge 'x86/alternatives'