Merge from push event notification test 7d42c7562abfde69