Merge branch 'WIP.x86/alternatives'