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

This reverts commit b84c2ac99bd2b9d644bcaaf2ee92ba02e106e981.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the smclib sub directory