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

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