Merge from push event notification test 246d4f5020c7a0c6