T3 mostafaadel 3.10

@samehmetias  @AmrEmara  @mahmoudawadeen  @mshebokshy  @Zaatar 

#157