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

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