Merge branch 'core/debug' into core/core