fix ORM count for query with group
Merge remote-tracking branch 'origin/master'