Merge "Topology listener API" into main