Merge branch 'jn/maint-fix-pager'