bugfix from changing og.common.events
Merge branch 'ui/dev' into ui/topic/analytics-form