CON-832 | Notifications changes [WIP]