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

This reverts commit 6ebbba7245654149d000a4a49c9942aa2079abdc.
Rebase from 'upstream'
Trimmed the branch to only the sr_ronex sub directory