improve count all
Merge branch 'hotfix/2.1.10'