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

This reverts commit 467b8f7e1d266c550479b479a3cfbebed60f4c02.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the sr_ronex_test sub directory