[PLAT-4363] Point CDS functions to new code