Add auto_hotplug from thalamus
from @thalamus