Merge branch 'phy-listing-link_topology-tracking'