initial work on pagination
Merge branch 'bugid-97783' into consumer-wam; initial work on pagination