Merge "Update as AnnotationAttribute.value is now legacyValue" into main