CB-3663
Paging functionality