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

This reverts commit ea52eea78cf61899d6e98ef0a96f611a1b5f5c59.
Rebase from 'upstream'
Trimmed the branch to only the rocon sub directory