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

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