consolidate event logging to avoid translated labels in analytics
Merge branch 'staging'