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

This reverts commit 34cb5e2a5a7bfef99861bb221840454c08253d5d.
Rebase from 'upstream'
Trimmed the branch to only the scitos_touch sub directory