Fixed compensation for pagination over multiple pages.
Merge branch 'refs/heads/development'