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

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