Merge branch 'vs/doc-spell' into maint