Merge "BUG-1089: migrate TopologyMapping"