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

This reverts commit a2f10a3ba8be744a449c1fae4b828607aa8d991b.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the octovis sub directory