Merge "Add option to limit what classes can have annotations" into main