Sync to RRO

Merge custom changes for RRO