INTEXT-111 fixed imports