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

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