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

This reverts commit 3971c19c5df8c475e8e436dc6280e4468381d863.
Rebase from 'upstream'
Trimmed the branch to only the topic_proxy sub directory