Fix spacing on event tags
Merge branch 'alpha' into staging
Merge branch 'staging'