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

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