[FIX] Split behavior for Notifications and Payments.