Merge "BUG-509: Fix topology not being augmented"