Cluster proxy

tracking this change