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

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