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

This reverts commit cb87014cfb3c6c984c1a19e97de7de1ac32002ee.
Rebase from 'upstream'
Trimmed the branch to only the rosrt sub directory