C1 mamdouh 516 notifications 2.10 2.11

@KhaledHelmy @MohabGhanim @AmirGeorge @Serag8