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

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