Merge from push event notification test 56c56e28a096f386