Merge in changes from my cdr-tds-conversion branch. This changes the internal