Merge "2-phase full-heap CC"