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

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