Merge "Update NotifEvent"