Tried fixing CCF in #55, 55 not applied on D11, so not attaching the interdiff.