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

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