Fixed issue with server side generation of clusterIds