Merge in auto_hotplug