Simpler version cluster finder
Add simpler cluster finder from master branch
Merge branch 'master' into production