Fix: email trigger missing @entity_type, action tagged as 'Updated' for groupings under contact entity
Merge branch 'dev' into test