Merge "Apply static RRO"