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

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