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

This reverts commit 84328d8fb7a5308dad8b845ecbe34651267286c5.
Rebase from 'upstream'
Trimmed the branch to only the forward_command_controller sub directory