Merge "add support for large cluster"