Merge "Record class status after verification." into oc-dev