Merge branch 'ta/doc-cleanup' into maint