NXP-8105: Add override logic into the notification service