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

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