Merge from push event notification test 1350aefb3d646deb