Dependent on merge of feature/notification-refactor
Dependent on merge of feature/notification-refactor