Merge "Allow class kind to be used in AnnotationTypeDoc" into main