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

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