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

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