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

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