Merge from push event notification test ace4c1b20e4aeeda