Merge "BUG-1089: convert TopologyReader"