Merge branch 'core/resources' into x86/core