merged otnateos:INTEXT-58