T1 lotfy 1.11

@kalamoni  @andrewkhouzam  @abdelrahmansakr  to be reviewed