merge changes from ITXT-4