[Olena-patches] last-svn-commit-221-ga69fad4 Revamp topology-related routines.