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

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