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