Merge "Remove dangling links in secondary namespaces"