Merge branch 'core/urgent' into smp/hotplug to pick up dependencies