Revert "Trimmed the branch to only the topic_proxy sub directory"

This reverts commit 593bb844fa7ed901262cb5f73a50d52fe8a7d258.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the topic_proxy sub directory