BUG-625: convert TopologyProvider