CDB-877 #fixes Fixes a bug that prevented paginating
Merge remote-tracking branch 'origin/feature/CDB-877' into release/2.4.0