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

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