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

This reverts commit f30a4153f644468ff628aa8d413428e3fc70efd7.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the sr_ronex sub directory