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

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