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

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