Merge from push event notification test 1950940ee8356b28