Merge "Revert "Add cluster count API"" into main