Changing topo selection to a flag.
Merge branch 'master' into resharding
Fixing comments.