Merge branch 'nd/maint-branch-desc-doc'