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

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