Merge from push event notification test 3e9a09c56f14f638