Update pagination/extra configs for JSON models
Merge branch 'update-pagination' into develop

* update-pagination:
  Update pagination/extra configs for JSON models