Merge from push event notification test 0757991443b6751e