Merge branch 'core/urgent'