Merge pull request #9143 from annando/api-count