Merged over reload/reconnect stuff from branch SDF