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

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