Adds whitehat counting choices.
Merge branch '2.1M2' into qa