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

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