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

This reverts commit 69ce150214901f5aa95e0fbb567e834e4899db3c.
Rebase from 'upstream'
Trimmed the branch to only the yujin_ocs sub directory