Merge "Only update the current connected set for selfManaged only" into tm-dev