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

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