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

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