FEND-1188 updated logic around getting the page number
Merge branch 'dev/FEND-1188' into release/2.7.4rc