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

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