Merge branch 'jk/pager-per-command' into next