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

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