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

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