ref #8041 revert all changes except for the first and for the new method CdmUtils...