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

This reverts commit 0a478a0521f5ceb90ba96252066a16b02b122578.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the sr_standalone sub directory