CLDIDE-1891; adopt API changes;
CLDIDE-1891; adopt API changes;