Auto Hotplug: update to my latest from S3