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

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