Merged back my device hotplug patch from 1.11