Merge branch 'x86/core' into tracing/textedit