T3 samehmetias 4.21

@mahmoudawadeen  @mostafa-adel @AmrEmara @mshebokshy please review 
#318