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

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