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

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