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

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