[571760] Accommodate extra Constraint eAnnotations
3 files changed