Merge pull request #1211 from shackbarth/21229-count