Merge "Topology Manager to avoid redundant edge updates"