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

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