Fix count method error
Merge branch 'master' into application-dev