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

This reverts commit 8ec5deb967fcca87ff3e60659bddb07757901d22.
Rebase from 'upstream'
Trimmed the branch to only the scitos_mira sub directory