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

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