Merge branch 'nd/edit-branch-desc-while-detached' into maint