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

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