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

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