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

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