Pagination module case fixed
Merge branch 'master' into cmlsl

Update and fixes from master