T4 omarsh 4.5

#126 

@aaeabdo  @karim-elbawab @Zaatar @MennatallahElKharbotly