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

This reverts commit 6d908c2b1f5b2d5cb4fb6f8411812bb665e10aba.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the rosh_core sub directory