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

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