use Sadia version of CCMIS with decomposition heuristic. source is on hold for publication, so won't compile until then.
fix merge conflicts