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

This reverts commit 54fac643e316b0fe4f59005ff953866390c09a63.
Rebase from 'upstream'
Trimmed the branch to only the rtmros_nextage sub directory