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

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