Clustering enhancements (#4822)
Merge pull request #4823 from szekerest/cluster

Clustering enhancements (#4822)