Merge "Restrict use of framework-annotations" into main