Merge branch 'jc/doc-diff-filter-exclude' into maint