Merge pull request #1 from cubejs/cluster3

Cluster3 (reverted from commit 6cebcbd82d5ad5fd8bbcbfd36a26a8106bf137bb)