Merge "Remove the lookup distortion class" into oc-dev