update push event builder
Merge branch 'feature/notifications' into new_staging

* feature/notifications:
  update push event builder