pagination improvements, fixes #6542
pagination improvements, refs #6542
Merge branch 'dev' into test