Merge "Automatically reconnect sensors"