Merge "Average of top 4 CNO" into oc-dr1-dev