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

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