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

This reverts commit a6364f1eefbafcf93a35c6be5bd9e2562fef5180.
Rebase from 'upstream'
Trimmed the branch to only the sr_standalone sub directory