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

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