[cvs-nhc98] Merge more updates of hat tools back into stable-1-06-bran