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

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