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

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