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

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