Merge branch 'core/entry' into x86/entry