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

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