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

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