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

This reverts commit 1a4002c6e85e7aa9504027380f32976b665a5d9a.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the controller_interface sub directory