Merge branch 'jc/branch-description-unset' into maint-2.38