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

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