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

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