Pagination module case fixed
Merge branch 'master' into gbiz

Updates and fix from master