Pull Request: C5_Amir_145_system_reminders_5.4

@Husseny @linsara @nadineadel @MussabElDash