Model fields.
Aggregate function fix.
Merge branch 'master' into develop

* master:
  Aggregate function fix.
Merge branch 'develop' into model-query-relations

* develop:
  Aggregate function fix.
  Model fields.