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

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