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

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