Merge from push event notification test a4aaad7b24cd8207