Introduce instance ID for clustering
Merge pull request #326 from emmanuel-keller/1.5

Introduce instance ID for clustering #325