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

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