Allow the topology to be rebuilt if needed

Change-Id: Ie03c862a14ec3a9b0c117bd9a802ee2b9b815cc7
Merge commit 'a49ab9f9b0b34cd8bb67c53474f0300ae84632fc'