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

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