Merge "TAPI controller Topology"