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

This reverts commit 434ecb5e19e8c61896c10770388ea495566ca997.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the forward_command_controller sub directory