s/entity/object for consistency with other parts of idno
Merge branch 'annotation_trigger_obj' into dev