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

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