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

This reverts commit 17b72d891d0206991b1a14513cd916836eec8d45.
Rebase from 'upstream'
Trimmed the branch to only the grizzly_motion sub directory