Merge branch 'jn/maint-setup-fix' (early part) into jn/paginate-fix