Merge from push event notification test 047e2564663f0bda