Merge branch 'nd/doc-ignore' into maint