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

This reverts commit bb0d404dcee93e0e704f7802a2a2c22f1aa47503.
Rebase from 'upstream'
Trimmed the branch to only the controller_interface sub directory