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

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