Merge branch 'core/debugobjects' into core/urgent