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

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