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

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