T2 mina 2.1 2.7

@FatmaEmran @tonyfoti @helali1993 @mohamed-halawa