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

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