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

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