Merge branch 'vs/doc-spell'