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

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