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

This reverts commit 5f588dac31cda0ec919f93200b2e186a4cfbb95a.
Rebase from 'upstream'
Trimmed the branch to only the rosh_core sub directory