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

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