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

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