Merge branch 'po/maint-refs-replace-docs' into maint