Merge from push event notification test 9fe4d683c45d2908