Reviewer MATT: PPR and RTR code review mark ups

More code to follow, this is just the cpp-common changes