Make more annotations extend ConstantAnnotation
#9336
+19
−10
Merged