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

This reverts commit e3bc3777813191420d83756f719c925888ed2ad7.
Rebase from 'upstream' @ version '1.9.41'
Trimmed the branch to only the tools/topic_tools sub directory