Merge branch 'feature/refactored-pagination' into 'master'

Consolidated the different pagination implementations

See merge request !12
2 jobs for 2.0.0 in 1 minute and 48 seconds (queued for 2 seconds)
latest
Status Job ID Name Coverage
  Test
passed #95583
docker
code_analysis

00:01:48

passed #95582
docker
test

00:01:41