Merge branch 'x86/core' into x86/generalize-visws