Merge branch 'nd/doc-extensions'