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

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