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

This reverts commit 56a4a5824b5b387f1bfb37335fe82eff14b11a35.
Rebase from 'upstream'
Trimmed the branch to only the controller_manager sub directory