ref #6730 Adapt to cdmlib changes