Updated based on preliminary decision.

[HansOlsson]

Closes #2288

[henrikt-ma]

Approving based on being what I believe is a better match with what was originally agreed on in the phone meeting.

The poll in the discussion that followed, however, doesn't look decisive to me. My interpretation of this is that merging Evaluate annotations is a topic we might come back to in the future if the current design doesn't serve us well.

[HansOlsson]

Approving based on being what I believe is a better match with what was originally agreed on in the phone meeting.

The poll in the discussion that followed, however, doesn't look decisive to me. My interpretation of this is that merging Evaluate annotations is a topic we might come back to in the future if the current design doesn't serve us well.

I agree that this is likely, but that shouldn't prevent us from having some rule at the moment.