Merge from push event notification test 6e95d616a22ae315