Merge branch 'nd/commit-p-doc' into maint