Fixed CCF, attached interdiff for same. Please review