Replace paginated queries with iterview
Merge branch 'release-v3.6'