Merge branch 'pp/maint-doc-pager-config'