Merge "Implement topology normalization" into main