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

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