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

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