CLDIDE-1891; adopt API changes;