Merge branch 'jk/fix-alias-pager-config-key-warnings' into maint