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

This reverts commit b4e62e1d4567f98248dfa9ee16ef9f53b68babc0.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the rosping sub directory