Merge "DO NOT MERGE: Reduce re-ranking" into oc-dr1-dev