Merge "Properly measure dataset presentations" into oc-dev