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

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