fixed partial for pager
Merge branch 'paging-fix' into develop