Merge branch 'jn/paginate-fix'