Fixed CCF, attached interdiff for same.