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

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