Pagination bugs fixed.
Merge branch 'hotfix/fix_pagination'
Merge branch 'master' into develop