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

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