Merge "Bring back the priority feature for static RRO" into oc-dev