Merge branch 'nd/doc-new-command' into maint