DDA to CZS merge, cherry picked.