Merge from push event notification test 052bd7e54cf1b5ae