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

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