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

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