Add Attachment:STR-376: Replace prims for annotation manipulation by annotation match and build operations