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

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