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

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