mako_hotplug: merge latest developments