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

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