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

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