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

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