MDL-31989: Pagination + cleaning GS setup