Check-point before refactoring the topology provider stuff.
10 files changed