Pull request: C2_Atef_584_Notification_2.9

#584   @AmirGeorge  review please