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

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