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

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