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

This reverts commit 3fc9c5b7a1cfd1f54ac81d717bf80f09bf1714bf.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the scitos_mira sub directory