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

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