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

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