Merge "Fix --annotation-allowed-classes-file, and start using it" into main