tess merge until rev 47