Merge branch 'hotplug' into devel