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

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