Merge branch 'x86/setup' into x86/devel