Merge branch 'fe-paginated-environments-api-add-pagination' into fe-paginated-environments-api-add-subview

* fe-paginated-environments-api-add-pagination:
  Changes after review
  Rename storePagination to setPagination