merge changes from ITXT