Merge "Move veridex to ClassAccessor"