Merge "Enable static RROs by default" into oc-dev