Merge from push event notification test 2b222a974d7ee3f7