Rebase from 'upstream' (no changes)
Trimmed the branch to only the rosping sub directory
Revert "Trimmed the branch to only the rosping sub directory"

This reverts commit 9b52f316968500d30edc8cda89900b524489f93a.
Rebase from 'upstream'
Trimmed the branch to only the rosping sub directory