CON-1016: Added breakpoints for notifications