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

This reverts commit ef5135a84b939b80e4db33fd76f2e9abbc36fad6.
Rebase from 'upstream'
Trimmed the branch to only the smach sub directory