T4 menna 4.18

@karim-elbawab @osherifo @aaeabdo please review
and for abdelsatar review only the view test :)