[cvs-nhc98] patch applied (york-compiler98): TAG working nhc98 after the merge