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

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