Merge "added feature topology manager shell"