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

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