CVS snapshot in sync with ldclt 4.23