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

This reverts commit 5972f0ce8794618b3afc660786fceb7417f8b4e6.
Rebase from 'upstream'
Trimmed the branch to only the octovis sub directory