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

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