issue #21229: be more exclusionary
issue #21229: allow incoming count value
Merge pull request #1216 from shackbarth/21229

issue #21229: be more exclusionary