fix issue on pagination. Speedbuild
Merge remote-tracking branch 'origin/master' into Saumya