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

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