Merge branch 'hotfix/2.1.9'
improve count all
Merge branch 'hotfix/2.1.10' into develop