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

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