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

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