Clustering with progress report.
Merge branch 'sp' into develop