Composite working with a missing cluster number in occ

Hi @nperez

For issue #248 (closed) , I create the merge request first. And we can discuss about the next release afterward.

Cheers,
An-Chi