[RP-5211] disable notifications

Disable notifications and add a few blocks to enable more flexible modifications