Paging bugfixes.
Merge branch 'development'