KAZOO-2917: Fix CDRs