Merge "Synchronize access to ranking helper records." into oc-dev