Merge branch 'tk/doc-filter-branch' into maint-1.8.1