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

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