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

This reverts commit 76d4072f81783cd34241f999710ece206b8f2f1b.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the tools/topic_tools sub directory