Merge branch 'je/pager-do-not-recurse' into maint