Merge "Add cluster count API" into main