Merge "Clean up ArtClassDefinition" into oc-dev