Revert "Trimmed the branch to only the tools/topic_tools sub directory"

This reverts commit cb9e86ab758a4aa664fa089cc914724b2f6d6779.
Rebase from 'upstream'
Trimmed the branch to only the tools/topic_tools sub directory