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

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