Merge branch 'as/maint-doc-fix-no-post-rewrite' into maint