Merge "Host updates for Topology"