Merge branch 'ma/pager-per-subcommand-action' into maint