Merge branch 'core/types' into x86/x32