Avoid any clustering if clustering is disabled
Merge pull request #1 from iosphere/feature/shortcircuit-cluster

Avoid any clustering if clustering is disabled