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

This reverts commit 7adec31f5b5994c0146039d9f57dc9a5cb4a149d.
Rebase from 'upstream' @ version '1.5.3'
Trimmed the branch to only the octovis sub directory