Merge from push event notification test 6802ce8f5dd91975