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

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