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

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