Merge pull request #2854 from DimitriPapadopoulos/topoplogical

topoplogical and friends