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

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