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

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